gtkwindow: Stop checking gtk-menu-bar-accel

diff --git a/gtk/gtkwindow.c b/gtk/gtkwindow.c
index 34b1e7c4111fe4e5de5c5ee3d46e77db6a12004a..03a9689e95b6a12eb625c7357b8b86d1a34156cd 100644 (file)
--- a/gtk/gtkwindow.c
+++ b/gtk/gtkwindow.c
@@ -149,6 +149,7 @@
  * widget that is added as a titlebar child.
  */
 
+#define MENU_BAR_ACCEL "F10"
 #define MNEMONICS_DELAY 300 /* ms */
 #define NO_CONTENT_CHILD_NAT 200
 /* In case the content (excluding header bar and shadows) of the window
@@ -10545,28 +10546,17 @@ gtk_window_activate_menubar (GtkWindow   *window,
                              GdkEventKey *event)
 {
   GtkWindowPrivate *priv = window->priv;
-  gchar *accel = NULL;
   guint keyval = 0;
   GdkModifierType mods = 0;
 
-  g_object_get (gtk_widget_get_settings (GTK_WIDGET (window)),
-                "gtk-menu-bar-accel", &accel,
-                NULL);
-
-  if (accel == NULL || *accel == 0)
-    return FALSE;
-
-  gtk_accelerator_parse (accel, &keyval, &mods);
+  gtk_accelerator_parse (MENU_BAR_ACCEL, &keyval, &mods);
 
   if (keyval == 0)
     {
-      g_warning ("Failed to parse menu bar accelerator '%s'", accel);
-      g_free (accel);
+      g_warning ("Failed to parse menu bar accelerator '%s'", MENU_BAR_ACCEL);
       return FALSE;
     }
 
-  g_free (accel);
-
   /* FIXME this is wrong, needs to be in the global accel resolution
    * thing, to properly consider i18n etc., but that probably requires
    * AccelGroup changes etc.